Merge version 5.15.1+dfsg-4+rpi1 and 5.15.2+dfsg-2 to produce 5.15.2+dfsg-2+rpi1 archive/raspbian/5.15.2+dfsg-2+rpi1 raspbian/5.15.2+dfsg-2+rpi1
authorRaspbian automatic forward porter <root@raspbian.org>
Fri, 18 Dec 2020 15:21:32 +0000 (15:21 +0000)
committerRaspbian automatic forward porter <root@raspbian.org>
Fri, 18 Dec 2020 15:21:32 +0000 (15:21 +0000)
1  2 
configure.json
debian/changelog
debian/patches/series
debian/rules

diff --cc configure.json
Simple merge
index 6755856f1e1a21f5ea997e3e04278ddb895ddd9e,e3cd515af3e6253e15641f22651cb7cad73ed41d..6621f14c85102dc34d6216d202434346aa67bc11
@@@ -1,12 -1,37 +1,47 @@@
- qtbase-opensource-src (5.15.1+dfsg-4+rpi1) bullseye-staging; urgency=medium
++qtbase-opensource-src (5.15.2+dfsg-2+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes introduced in 5.6.1+dfsg-2+rpi1] by Peter Michael Green]
 +  * Partially fix clean target.
 +
 +  [changes introduced in 5.9.1+dfsg-9+rpi1 by Peter Michael Green]
 +  * Disable neon (-no-neon no longer seems to work, so edit configure.json instead)
 +
-  -- Raspbian forward porter <root@raspbian.org>  Tue, 01 Dec 2020 16:30:10 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 18 Dec 2020 15:21:31 +0000
++
+ qtbase-opensource-src (5.15.2+dfsg-2) unstable; urgency=medium
+   [ Alexander Volkov ]
+   * Backport upstream patch xcb_screens_uaf.patch in order to fix
+     use-after-free in the xcb plugin.
+   [ Dmitry Shachnev ]
+   * Build with libxcb-util-dev 0.4.0 which Debian now has.
+     - Drop loosen_xcb-util_requirement.diff, no longer needed.
+   * Bump Standards-Version to 4.5.1, no changes needed.
+   * Upload to unstable.
+   [ Lisandro Damián Nicanor Pérez Meyer ]
+   * Build the experimental XCB native painting engine. This has been disabled
+     as a default by upstream, but our X2Go users do really benefit from it if
+     they export QT_XCB_NATIVE_PAINTING (Closes: #976274).
+  -- Dmitry Shachnev <mitya57@debian.org>  Fri, 11 Dec 2020 11:31:30 +0300
+ qtbase-opensource-src (5.15.2+dfsg-1) experimental; urgency=medium
+   * New upstream release.
+   * Drop two patches that are included in the new release:
+     - emit_geometry_changed.diff
+     - clone_sigchld.diff
+   * Bump ABI version to qtbase-abi-5-15-2.
+   * Update debian/copyright using debian/scripts/update-copyright.
+   * Add a patch to loosen xcb-util requirement from 0.3.9 to 0.3.8
+     (see #975259).
+   * Build-depend on libxcb-util0-dev.
+   * Update debian/qtbase5-private-dev.install for the new release.
+   * Update symbols files for the new release.
+  -- Dmitry Shachnev <mitya57@debian.org>  Fri, 20 Nov 2020 16:08:35 +0300
  
  qtbase-opensource-src (5.15.1+dfsg-4) unstable; urgency=medium
  
Simple merge
diff --cc debian/rules
Simple merge